Some cleanups
Rename; arc consistency
Pokusy o optimalizaci
???