Cleaned shit up a bit.