Implement Guard
Remove unnecessary flag
Don't submodule base-style