Another HUGE code clean up! :D