Getting rid of id and type as names for variables. Fixed #13.