got rid of syntax errors & more structure