Cleaned up control a bit