Cleanup & formatter :P