just some cleanup =)