Started clean-up / asset improvements