cleanup and refactoring
Merge branch 'master' of https://github.com/Ataww/website.git