Remove unused property
Dynamic margin
Clean up
Safer code