Add chaining to end of functions, improve semicolon consistency
Merge remote-tracking branch 'origin/master'