Cleaned up logs and errors