Make local memory optional
Fixing tabs/spaces (finally)