modify skeleton more cleaner