Solved several formating issues