Cleaned up code following update