Cleaned up formatting of coponents (temp)