removed unnecesary whitespace, next: refactor