Code cleanup, in bandung right now.