refactored a tiny bit and took out some commented out stufffssss