Configuration settings + comments + cleanup