assem: cleaning the code, contd.