Fixed formatting, whitespace and replaced depricated properties