Code cleaup… Continued