Did some refactoring
Changed author name
Changed author name