Updated documentation
Polished source code