removing constructor code, code formatting, comments