Cleaned up passing of parameter