Modified code to go with easytag coding style