Refactor / reformat based on Static Code Analysis
Update test suite for latest changes
Update test suite for latest changes