Cleaned a bit. Removing debug lines