change comments and name conventions