Fixed code to usual standards