Removed commented structure observation + tweaks