Code and styling clean up