Cleaned up after porting from Dancer