Code cleaned, aligment & indenting done