Clean code for features