Index

Cleaned out the code a bit