Code clean up fifth commit