cleaned up style :)