Removed redundant code and added explicit typecasts.

Removed nonessential NSLogs and some redundant/repetitive code.  Added some explicit type casts between
equivalent enum types.