Minor refactoring & adding/updating documentation