starting
refactor code
minor
small cleanup work