Adding Comments and Trimmed Some Stuff