Refactored , removed some blanks