[AESH-43]
using ~/ should display correctly now
+ some cleanup