cleaned up various parts