Few changes & refactor