change classes for Layout, using Interface
delete this. suffix
add space in comment, add todo, some cleaning