Dev

Removed commented code.
Fixes the style that was mentioned in the review.