Trying to clean up things a bit, product still isn't what I want it to be