removed code concatination: Code smells