First commit - did extremely small refactoring.