Organized imports, removed redundant Log calls.