got rid of Settings file, more formatting