Clean up + optimization