Doing some code clean up + organization