Fixed BackBuffer and Code clean up