Move variable,constructor to comply with standard