grammar/English; naming conventions; removed some obsolete functions