[#007] Some small refactoring