General code syntax cleanup
Some more cleanups
Make backend is added correctly, if a single or multiple ones are specified.