Simplified logic + revert indentation style