Added shorthand, comments and file name change