Lame documentation is done
Some refactoring