fixed formatting, got rid of unecessary stuff