refactor prep on framework section

clean up of commented out functions and formating before refactor