Minor clean up of imports and adding serial version id