General cleanup

Read through the project for my first time, cleaned up some stuff along the way