Cleaned up input boxes