Polished some stuff 

Polished some stuff