Improve style :D