Some clean up based on suggestions by Josh Long