Fixed minor cleanup issue