Comments cleanup and moves to settings property rather than PHP env varable