Refactoring!! Mainly whitespaces!