fixed indentation and assignments