Fixed up crappy coding guidelines.
Will change storage mechanism later.