Organize project imports and do some small code clean-up.