Bug fix & refactor