[beatenpro] Simplify and improve