Class rearragements and fixing SA - CA warnings