Prevent console output and minor clean up