Solved minor errors and style