Code cleanup
Bump development version