Code clean up and added assets