Code cleanup, add reload command