Small adjusments, remove unnecessary pointers