Clean up + improvements