Spacing issues fixed

Implement spacing between functions that is consistent with original
master branch code