Cleaned up the yaml code a little