Updated documentation
Code cleanup