Cleaned things up a bit. Still a fucking mess.