Better spacing in yml files. Add better way for credentials.