Small refactoring;
Code cleanup.