cleaning up the style and layout