Cleaned up code and formatting

Removed spurious spaces and reformatted code for easier readability.
Removed more items related to channel 2555 (unused).