small refactoring + fix start property condition