More code improvement + started cleanup...