Updated code to incorporate review comments.
Deleted unused class.
Fixed styling issues.