Simplify code, remove useless comment and rename layout name