Constant usage and better comment