updates & cleanup

http://review.cyanogenmod.org/#/c/68063/