changed code to follow java naming convention