More added skills section and some refactoring