Minor updates + cleaning