Clean ups (due to CodeOCD)