Code cleanup

It looks hawt now.