Change char *var into char* var
Added correct modifier persistence and some rudimentary layout comments