cleaned up code, reverted label changes