Changes
Code cleanup