Syntax cleanup, small additions