* Small code refactoring and removeing of unnecessary new line