Typo in file
Relayout code
Some cleanup