removed some comments, externalized configuration