Cleaned up structure and removed fixed size arrays
Cleaned up code and removed fixed size arrays.