Pull request to pretty up some different things to make project easier to maintain.