Start to clean up code a little bit