Cleanup Code and increment Version Number