code cleanup, stake gui changes