Updated description and tidied up code a bit

Signed-off-by: Alex Angell <alex.c.angell@gmail.com>