Just cleaning up code