Cleaned up more markup