Did a lot of cleaning up of code. Still a good chunk left to go though.