Fixed code formattins issues