more simplification of frontend code