eppixx did some refactoring and added some comments