Small changes & Code cleanup