Light refactoring and added note