Cleaner code.
Initial release.