moving and renaming for my sanity
handling class variable declarations