Finally fixed formatting issues