Refactor code structure, improve output upon error