[BUGFIX] Code cleanup