some cleanup and adding missing things
Merge pull request #5 from pyellambalase/chore/refactor_and_cleanup

some cleanup and adding missing things