Refactoring to conform to Lelylan guidelines
Minor refactoring