Added Strings and Cleaned Code Layout