Cleaned up Skeleton angle code