cleaning assemble code up