clean up the featured functionality

Everything should work the same, just cleaner code.