mher: Source code refactoring. Let's keep it neat and tidy in the future.