Minor Documentation + Minor Refactoring