Code audit / cleanup