removed extra shit, formatted code