Added initial watch task, fixed some code style problems
Closes #24