Fix whitespace issue
Remove redundancies