Smaller refactoring and added comments