Cleaned up strings and indentation