Clean-up and commenting of code
Clean-up documentation