Cleaned up various parts