Refactoring
Signed-off-by: fantaros <fantasymon@gmail.com>