pass less config, variable cleanup, improved comments