#91 Improved coding style and comments