Cleaned up some markup