Clean up Skeleton.cpp