Fixed bugs in UNDEFSTORE code path
Edited files for style
Merge branch 'master' of https://github.com/mjyan0720/fs-aa
Cleanup after merge