Cleaned up some small inconsistencies