removed some parentheses; removed old code
added constructor