Cleanup and typos

Signed-off-by: pianomister <stegiemail-github@yahoo.de>