Refactoring
Temporary commit.