Cleanup of Code