Cleaned up code ... some