full solution code cleanup, changed settings