Version 0.2: Clean up. No functional difference - I don't think it needs any. :)