refactored code a bit
Improved linting options and base code for lint
updated TODO