- Fixed a lot of astethics