Cleanup styles, remove old boilerplate