Cleaned up a little a bit