Cleaned up some elements