Removed unncessary commented code
changed to switch cases