Removed xDebug + tidy up