Cleanup and worked on documentation