Updated (c) date and some cleaning