Cleaning up... docs pending

Signed-off-by: Stal <stalidon@gmail.com>