Remove a debug message and move around some methods