Cleaned up output and added "hide" functionality