Output working, general cleanup