Small update of class for cleaner source, better to understand.