cleaned up machining