Code clean-up for SWP.java