Multiple refactor from previous commit

Signed-off-by: crynobone <crynobone@gmail.com>