Some random code clean up