cleaned up stuffff