Cleaned up source file a bit.