Minor code style changes & recompile plugin