Fix some issues regarding coding guidelines - Refs. #58