remove unnecessary check on routine that is always run by constructor, make variables final by moving code to constructor