Fix spacing, naming and double qoutes