Refactoring round

Just for testing how to use pull request