Added * operator

Also fixed 80 line formatting