Some fixes have been made
Fixed code aligment