Cleaned up these two files