Improves readability of code, removes outdated functions