ON Page: Code cleanup