improve constraints, other minor stylistic stuff
minor stylistic tweaks