Fixed a little bit of your conventions