Simplify code and hide comments