Cleaned up for github push