Clean up + small changes