clean up code

because i'm a noob

I really hope I didn't break it.

Change-Id: I617aa683034af52706788d620a634a2284255020