some cleanup
move dimension constants to a separate h file