Cleaned up the code
Signed-off-by: Michael Englehorn <Michael@englehorn.com>