Updates
Removed mixins
Removed comments
Small updates