Cleaned everything up a bit.