Code updates/cleaning