Cleaned some general coding styles (if/elses, spaces around concatenators)