Code formatted, added ScenicView support