clean up; prepeing for automagic tools

Signed-off-by: devxdev <xdev@devxdev.com>