Cleaned up yml a bit
see #195