add butter knife annotation and clean up code