Refactor / reformat based on Static Code Analysis