Step1 320 and 480 almost done, plus some code cleaning