Working on style and refreshing sam parts