just cleaning up code