Fix small issues with syntax error, also fancy formatting