Cleanup

Syntax cleanup + additional requirement