Refactor, cleanup and some comments