got all formatting fixed