Code clean-up

Lookin' fancy and stuff