Fixed indentation... Dumb.
Code cleaned up.

Just need to check one requirement with Dr. Tran tomorrow.