Additional code cleaup