Changes based on suggestions made by flint++