CON-105 | Forms - code cleanup