Cleaned up some code alignment