Updated some code reuse issues