Following code guidelines (Fixes #1)