remove commented code, +explicit public