Reverse-abstracted everything
Style fixes