Nits & Complier warnings & whitespaces