Added mixins, cleaned up headers of files