Bug fixing
Code organization