Changed some things to adhere to conventions and/or be more organized