[TASK] Fix some issues regarding coding guidelines - closes #58