v0.21

Cleaned up the code