Cleaned up Yue's stuff