Cleaning up code and adding Indentifier class