Fix selection error and cleaned up formatting