Refactor stuff, general cleaning.