Formatting, added option to disabel static file serving