Fix issue 49

Fix for single user function case , and take care of different coding styles.