Cleaned up flapjack repo