Updated version number and cleaned up a few lines of code