Cleaned up source a bit.