updated to match preferred code standard