Changes after Vera's review
Further cleanup changes