fix: code simplification