some cleanup.. hope this is better