More Code cleanup

-Some changes missed the last commit
-Just some formatting