Code clean up and version freeze to 1.2.0

Signed-off-by: Oliver Krylow <okrylow@gmail.com>