Cleaner font, some formatting and I think fully working