Fixed hydration
Cleanups by CS Fixer
Updated readme