Cleaned up formatting and renamed generic object names to more useful names.