Code cleaup