minor refactoring
edited/removed/translated comments
deleted old code