(refactor) Added spacing