Jacopi Patch 2

Cleaned up a nasty switch statement and removed an outdated comment.