Cleaned-up Commit

Minor cleanup. All I can do for now. Up to you guys for rest.