Updated skeleton structure to clean it up ready for next stage