Code clean, small bug fix