Added more code cleanups