7.1

Cleaned up code.