Code clean up, no progress on reaming tasks