Use autoload functionallity & correct default calc_comment