Cleaned up some compiler formatting and return types.