Code cleanup
Bump version, polish build files