fixed all formatting issues