Some cleanup
Break apart DOT functions