Refactoring documentation. Adding author
Added switch-case like behavior to where