Code cleanup of sorts
Style fixes