Clean up position.cpp