Removed endline
Refactored a slight amount. Was gonna' be more but PHP 5.6 didn't want to install itself.