Modified a few things based on suggestions.