Remove swp
Improve readability of log for less debugging