RESOLVED #7
Cleaned up code after FIX #7