deleted some unused values, indented some stuff