Feature atomization

A couple more easy ones