Cleaned up input/outputs