Cleaned up some code.

Signed-off-by: Quinn Hoener <quinn@seven2.com>