Cleanup & styling update