made the code a tiny bit less hacky (fixed regex, formatting, repo config)