Started refactoring skeleton drawing