cleanup, whitespace, STS warnings
cleanup, updated to latest release plugin