Cleaning up and strengthening consistency