Cleanup/commenting

Deleted some extra code, added docstring comments, made some methods
private / static