General Commit: fixed small errors and formatted