Made some refactoring. Deleted unused file.