Added interest function and done some refactoring