Started adding property mixin for optimization
Cleaned some code