Version 6.2

Cleaned up code.