RC2 - Clean up code and Small changes