removed popwin-mode
some minor changes regarding code presentation