Better documentation;
Removed unused variables;