Cleanup and proper scoping. Java scopes seem odd to me.