added screenshot + some cleanup