Cleaned logs and error returns