refatoring, removed unused parameter warnings
refactoring, documentation