Added documentation and cleaned up method/parameter names