Layout beautifying, removing debug code :D