Got rid of refactoring issues.

Signed-off-by: Imalune <devimalune@gmail.com>