Added underscore and refactored a bit