v3.2.1

- Cleaned up code base.