Cleaned up the input a little