vim tweaking and java clean-up