Code cleanup
Bump patch version