Refactored for github