Bug fixing and refactoring