Refactored. Eliminated comments. Bumped version.