1.0

Refactoring and cleanup