--Updates--

Removed unnecessary functions and checks, improved output readability