Fixing message.
Optimizing the code using a single file with header.