Move key assertions to verify postcondition and some general cleanup