1 bug fixed. Refactoring.