Cleaned up compute grade code