Will do an entire new pull request for all the extra spacing / inconsistent coding.