Clean up control statement, regarding #153