Cleaned up source code and bumped Combyne