Partially through majore cleanup