some syntax changes and convention improvements