Cleaned up formatting and remove switcher references