Change screen size, code cleanup