Adds user param
Code cleanup.