Fixed coding convention, spacing related issues