Add comments
Bump version & Fix code style & rename