general improvement, removal of unneeded things

Signed-off-by: Vince Howard <hincevoward@gmail.com>