removed line breaks and cleaned up code indents