Code cleanup a little