Finishing up wrapping some variables in methods