Nagy refactoring volt...

Signed-off-by: TakRaj <takraj@gmail.com>