Minor

Cleaned code
Tests