Code beautification, removing extra output