Some minor refactor for beautybebeautyuty :P

Signed-off-by: eldr4d <nikofinas@gmail.com>