Added show functions to classes + minor cleanup of files