Improve code consistency
Extract helpers to a separate module, include in main app class
Remove unnecessary comments