Finished skeleton
Cleanup